Fix bug in bottles #6144
Fix bug in bottles #6144
Conversation
| @@ -13,7 +13,7 @@ | |||
|
|
|||
| BOTTLE_ERB = <<-EOS.freeze | |||
| bottle do | |||
| <% if !["#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}/bottles", "https://homebrew.bintray.com/bottles"].include?(root_url) %> | |||
| <% if !root_url.start_with?(HOMEBREW_BOTTLE_DEFAULT_DOMAIN) %> | |||
There was a problem hiding this comment.
What's this bit for? Not disagreeing just curious.
There was a problem hiding this comment.
This code has a purpose. Part of the macOS bottling pipeline runs on Linux, where HOMEBREW_BOTTLE_DEFAULT_DOMAIN is https://linuxbrew.bintray.com/bottles. We can end up with the opposite problem, where we'd have root_url "https://homebrew.bintray.com/bottles" in bottles.
There was a problem hiding this comment.
This code has a purpose. Part of the macOS bottling pipeline runs on Linux, where HOMEBREW_BOTTLE_DEFAULT_DOMAIN is https://linuxbrew.bintray.com/bottles.
It is no longer in this case as we now set HOMEBREW_FORCE_HOMEBREW_ON_LINUX in brew test-bot.
Further, reverting this would also help to remove superfluous root_url in linuxbrew/xorg and linuxbrew/extra.
There was a problem hiding this comment.
Fine with me if/when it's fine with @sjackman.
There was a problem hiding this comment.
Fine with me then. Thanks, @xu-cheng.
| @@ -13,7 +13,7 @@ | |||
|
|
|||
| BOTTLE_ERB = <<-EOS.freeze | |||
| bottle do | |||
| <% if !["#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}/bottles", "https://homebrew.bintray.com/bottles"].include?(root_url) %> | |||
| <% if !root_url.start_with?(HOMEBREW_BOTTLE_DEFAULT_DOMAIN) %> | |||
There was a problem hiding this comment.
This code has a purpose. Part of the macOS bottling pipeline runs on Linux, where HOMEBREW_BOTTLE_DEFAULT_DOMAIN is https://linuxbrew.bintray.com/bottles. We can end up with the opposite problem, where we'd have root_url "https://homebrew.bintray.com/bottles" in bottles.
|
Thanks for this fix, @xu-cheng! |
It is used in `global.rb` and `brew bottle`. Closes https://github.com/Homebrew/linuxbrew-core/issues/13110.
This reverts commit e4f4e0f. This is no longer necessary as `HOMEBREW_FORCE_HOMEBREW_ON_LINUX` is set when uploading bottles for Homebrew.
|
Thanks again @xu-cheng! |
Before:
After:
Closes https://github.com/Homebrew/linuxbrew-core/issues/13110.
/cc @sjackman